Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 30 May 2010 11:55:39 +0000 (11:55 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 30 May 2010 11:55:39 +0000 (11:55 +0000)

Trivial merge